use g_return_val_if_fail() now that the function has a return value.

2008-08-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkstatusicon.c (gtk_status_icon_get_gicon): use
	g_return_val_if_fail() now that the function has a return value.

svn path=/trunk/; revision=21095

diff --git a/ChangeLog b/ChangeLog
index 1553196bdbd0b954071882b20b57d3b5aeae06c1..a4f3b35010f130f57a5d766d7439adee41c853cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkstatusicon.c (gtk_status_icon_get_gicon): use
+       g_return_val_if_fail() now that the function has a return value.
+
 2008-08-12  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkaccellabel.c

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 62167424a175188204505f81352ccec82383b475..d92387796b8c03daa4e8175d0d4c316172d4d4df 100644 (file)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1737,12 +1737,12 @@ gtk_status_icon_get_gicon (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
 
-  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
 
   priv = status_icon->priv;
 
-  g_return_if_fail (priv->storage_type == GTK_IMAGE_GICON ||
-                    priv->storage_type == GTK_IMAGE_EMPTY);
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_GICON ||
+                        priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 
   if (priv->storage_type == GTK_IMAGE_EMPTY)
     priv->image_data.gicon = NULL;